bitkeeper revision 1.1159.207.2 (41d3ee2b8X5k263Pk7ShvbMkpcLkMg)

manual merge

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 15c712f553779d966460817892a0132fe4c33670..b7bcbaa15b893314838a21e265406253ba7a8861 100644 (file)
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -513,7 +513,7 @@ void __init __start_xen(multiboot_info_t *mbi)
             e820_raw[e820_raw_nr].size = 
                 ((u64)map->length_high << 32) | (u64)map->length_low;
             e820_raw[e820_raw_nr].type = 
-                (map->type > E820_NVS) ? E820_RESERVED : map->type;
+                (map->type > E820_SHARED_PAGE) ? E820_RESERVED : map->type;
             e820_raw_nr++;
             bytes += map->size + 4;
         }

diff --git a/xen/include/asm-x86/e820.h b/xen/include/asm-x86/e820.h
index 0767642570b883ae58230e8849739027359d75e7..6d1af01e07ae143751b608dd85dae97ae2b4677e 100644 (file)
--- a/xen/include/asm-x86/e820.h
+++ b/xen/include/asm-x86/e820.h
@@ -5,10 +5,12 @@
 
 #define E820MAX        32
 
-#define E820_RAM       1
-#define E820_RESERVED  2
-#define E820_ACPI      3
-#define E820_NVS       4
+#define E820_RAM          1
+#define E820_RESERVED     2
+#define E820_ACPI         3
+#define E820_NVS          4
+#define E820_IO          16
+#define E820_SHARED_PAGE 17
 
 #ifndef __ASSEMBLY__
 struct e820entry {